# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.327.10 -> 1.1046.327.11 # include/linux/sunrpc/svc.h 1.22 -> 1.23 # net/sunrpc/svc.c 1.20.1.1 -> 1.20.1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/06/17 torvalds@home.transmeta.com 1.1046.337.4 # Fix moxa compile (at least for UP) and remove a few warnings. # # From Adrian Bunk. # -------------------------------------------- # 03/06/18 davidm@tiger.hpl.hp.com 1.1046.327.11 # Revert back to adjusting RPCSVC_MAXPAGES. # -------------------------------------------- # diff -Nru a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h --- a/include/linux/sunrpc/svc.h Mon Sep 22 13:01:21 2003 +++ b/include/linux/sunrpc/svc.h Mon Sep 22 13:01:21 2003 @@ -73,7 +73,7 @@ * This assumes that the non-page part of an rpc reply will fit * in a page - NFSd ensures this. lockd also has no trouble. */ -#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 1) +#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2) static inline u32 svc_getu32(struct iovec *iov) { diff -Nru a/net/sunrpc/svc.c b/net/sunrpc/svc.c --- a/net/sunrpc/svc.c Mon Sep 22 13:01:21 2003 +++ b/net/sunrpc/svc.c Mon Sep 22 13:01:21 2003 @@ -111,7 +111,7 @@ static int svc_init_buffer(struct svc_rqst *rqstp, unsigned int size) { - int pages = 1 + (size+ PAGE_SIZE -1) / PAGE_SIZE; + int pages = 2 + (size+ PAGE_SIZE -1) / PAGE_SIZE; int arghi; rqstp->rq_argused = 0;